Revision: baz--bug3376--0--patch-1
Archive: rob.weir@canonical.com--2004-public
Creator: Rob Weir <rob.weir@canonical.com>
Date: Sat Dec 11 02:27:42 EST 2004
Standard-date: 2004-12-10 15:27:42 GMT
New-files: commands/.arch-ids/lint.c.id
    commands/.arch-ids/lint.h.id
    commands/.arch-ids/resolved.c.id
    commands/.arch-ids/resolved.h.id commands/lint.c
    commands/lint.h commands/resolved.c commands/resolved.h
    tests/.arch-ids/test-changes.sh.id
    tests/test-changes.sh
Renamed-files: commands/.arch-ids/cmd-diff.h.id commands/.arch-ids/diff.h.id
    commands/.arch-ids/cmd-rm.c.id commands/.arch-ids/rm.c.id
    commands/.arch-ids/cmd-switch.c.id commands/.arch-ids/switch.c.id
    commands/.arch-ids/cmd-switch.h.id commands/.arch-ids/switch.h.id
    commands/cmd-abrowse.c commands/abrowse.c
    commands/cmd-abrowse.h commands/abrowse.h
    commands/cmd-add-id.c commands/add-id.c
    commands/cmd-add-id.h commands/add-id.h
    commands/cmd-add-log-version.c commands/add-log-version.c
    commands/cmd-add-log-version.h commands/add-log-version.h
    commands/cmd-add-pristine.c commands/add-pristine.c
    commands/cmd-add-pristine.h commands/add-pristine.h
    commands/cmd-ancestry-graph.c commands/ancestry-graph.c
    commands/cmd-ancestry-graph.h commands/ancestry-graph.h
    commands/cmd-ancestry.c commands/ancestry.c
    commands/cmd-ancestry.h commands/ancestry.h
    commands/cmd-apply-changeset.c commands/apply-changeset.c
    commands/cmd-apply-changeset.h commands/apply-changeset.h
    commands/cmd-apply-delta.c commands/apply-delta.c
    commands/cmd-apply-delta.h commands/apply-delta.h
    commands/cmd-archive-fixup.c commands/archive-fixup.c
    commands/cmd-archive-fixup.h commands/archive-fixup.h
    commands/cmd-archive-meta-info.c commands/archive-meta-info.c
    commands/cmd-archive-meta-info.h commands/archive-meta-info.h
    commands/cmd-archive-mirror.c commands/archive-mirror.c
    commands/cmd-archive-mirror.h commands/archive-mirror.h
    commands/cmd-archive-setup.c commands/archive-setup.c
    commands/cmd-archive-setup.h commands/archive-setup.h
    commands/cmd-archive-snapshot.c commands/archive-snapshot.c
    commands/cmd-archive-snapshot.h commands/archive-snapshot.h
    commands/cmd-archive-version.c commands/archive-version.c
    commands/cmd-archive-version.h commands/archive-version.h
    commands/cmd-archives.c commands/archives.c
    commands/cmd-archives.h commands/archives.h
    commands/cmd-branch.c commands/branch.c
    commands/cmd-branch.h commands/branch.h
    commands/cmd-branches.c commands/branches.c
    commands/cmd-branches.h commands/branches.h
    commands/cmd-build-config.c commands/build-config.c
    commands/cmd-build-config.h commands/build-config.h
    commands/cmd-cachedrevs.c commands/cachedrevs.c
    commands/cmd-cachedrevs.h commands/cachedrevs.h
    commands/cmd-cacherev.c commands/cacherev.c
    commands/cmd-cacherev.h commands/cacherev.h
    commands/cmd-cat-archive-log.c commands/cat-archive-log.c
    commands/cmd-cat-archive-log.h commands/cat-archive-log.h
    commands/cmd-cat-config.c commands/cat-config.c
    commands/cmd-cat-config.h commands/cat-config.h
    commands/cmd-cat-log.c commands/cat-log.c
    commands/cmd-cat-log.h commands/cat-log.h
    commands/cmd-categories.c commands/categories.c
    commands/cmd-categories.h commands/categories.h
    commands/cmd-changelog.c commands/changelog.c
    commands/cmd-changelog.h commands/changelog.h
    commands/cmd-changeset.c commands/changeset.c
    commands/cmd-changeset.h commands/changeset.h
    commands/cmd-commit.c commands/commit.c
    commands/cmd-commit.h commands/commit.h
    commands/cmd-default-id.c commands/default-id.c
    commands/cmd-default-id.h commands/default-id.h
    commands/cmd-delete-id.c commands/delete-id.c
    commands/cmd-delete-id.h commands/delete-id.h
    commands/cmd-delta.c commands/delta.c
    commands/cmd-delta.h commands/delta.h
    commands/cmd-diff.c commands/diff.c
    commands/cmd-diff.h commands/diff.h
    commands/cmd-escape.c commands/escape.c
    commands/cmd-escape.h commands/escape.h
    commands/cmd-file-diff.c commands/file-diff.c
    commands/cmd-file-diff.h commands/file-diff.h
    commands/cmd-file-find.c commands/file-find.c
    commands/cmd-file-find.h commands/file-find.h
    commands/cmd-find-pristine.c commands/find-pristine.c
    commands/cmd-find-pristine.h commands/find-pristine.h
    commands/cmd-get-changeset.c commands/get-changeset.c
    commands/cmd-get-changeset.h commands/get-changeset.h
    commands/cmd-get.c commands/get.c
    commands/cmd-get.h commands/get.h
    commands/cmd-grab.c commands/grab.c
    commands/cmd-grab.h commands/grab.h
    commands/cmd-help.c commands/help.c
    commands/cmd-help.h commands/help.h
    commands/cmd-id-tagging-defaults.c commands/id-tagging-defaults.c
    commands/cmd-id-tagging-defaults.h commands/id-tagging-defaults.h
    commands/cmd-id-tagging-method.c commands/id-tagging-method.c
    commands/cmd-id-tagging-method.h commands/id-tagging-method.h
    commands/cmd-id.c commands/id.c
    commands/cmd-id.h commands/id.h
    commands/cmd-import.c commands/import.c
    commands/cmd-import.h commands/import.h
    commands/cmd-init-tree.c commands/init-tree.c
    commands/cmd-init-tree.h commands/init-tree.h
    commands/cmd-inventory.c commands/inventory.c
    commands/cmd-inventory.h commands/inventory.h
    commands/cmd-join-branch.c commands/join-branch.c
    commands/cmd-join-branch.h commands/join-branch.h
    commands/cmd-library-add.c commands/library-add.c
    commands/cmd-library-add.h commands/library-add.h
    commands/cmd-library-archives.c commands/library-archives.c
    commands/cmd-library-archives.h commands/library-archives.h
    commands/cmd-library-branches.c commands/library-branches.c
    commands/cmd-library-branches.h commands/library-branches.h
    commands/cmd-library-categories.c commands/library-categories.c
    commands/cmd-library-categories.h commands/library-categories.h
    commands/cmd-library-config.c commands/library-config.c
    commands/cmd-library-config.h commands/library-config.h
    commands/cmd-library-file.c commands/library-file.c
    commands/cmd-library-file.h commands/library-file.h
    commands/cmd-library-find.c commands/library-find.c
    commands/cmd-library-find.h commands/library-find.h
    commands/cmd-library-log.c commands/library-log.c
    commands/cmd-library-log.h commands/library-log.h
    commands/cmd-library-remove.c commands/library-remove.c
    commands/cmd-library-remove.h commands/library-remove.h
    commands/cmd-library-revisions.c commands/library-revisions.c
    commands/cmd-library-revisions.h commands/library-revisions.h
    commands/cmd-library-versions.c commands/library-versions.c
    commands/cmd-library-versions.h commands/library-versions.h
    commands/cmd-lock-pristine.c commands/lock-pristine.c
    commands/cmd-lock-pristine.h commands/lock-pristine.h
    commands/cmd-lock-revision.c commands/lock-revision.c
    commands/cmd-lock-revision.h commands/lock-revision.h
    commands/cmd-log-for-merge.c commands/log-for-merge.c
    commands/cmd-log-for-merge.h commands/log-for-merge.h
    commands/cmd-log-versions.c commands/log-versions.c
    commands/cmd-log-versions.h commands/log-versions.h
    commands/cmd-logs.c commands/logs.c
    commands/cmd-logs.h commands/logs.h
    commands/cmd-make-archive.c commands/make-archive.c
    commands/cmd-make-archive.h commands/make-archive.h
    commands/cmd-make-branch.c commands/make-branch.c
    commands/cmd-make-branch.h commands/make-branch.h
    commands/cmd-make-category.c commands/make-category.c
    commands/cmd-make-category.h commands/make-category.h
    commands/cmd-make-log.c commands/make-log.c
    commands/cmd-make-log.h commands/make-log.h
    commands/cmd-make-version.c commands/make-version.c
    commands/cmd-make-version.h commands/make-version.h
    commands/cmd-merges.c commands/merges.c
    commands/cmd-merges.h commands/merges.h
    commands/cmd-missing.c commands/missing.c
    commands/cmd-missing.h commands/missing.h
    commands/cmd-move-id.c commands/move-id.c
    commands/cmd-move-id.h commands/move-id.h
    commands/cmd-mv.c commands/mv.c
    commands/cmd-mv.h commands/mv.h
    commands/cmd-my-default-archive.c commands/my-default-archive.c
    commands/cmd-my-default-archive.h commands/my-default-archive.h
    commands/cmd-my-id.c commands/my-id.c
    commands/cmd-my-id.h commands/my-id.h
    commands/cmd-my-revision-library.c commands/my-revision-library.c
    commands/cmd-my-revision-library.h commands/my-revision-library.h
    commands/cmd-new-merges.c commands/new-merges.c
    commands/cmd-new-merges.h commands/new-merges.h
    commands/cmd-parse-package-name.c commands/parse-package-name.c
    commands/cmd-parse-package-name.h commands/parse-package-name.h
    commands/cmd-pristines.c commands/pristines.c
    commands/cmd-pristines.h commands/pristines.h
    commands/cmd-rbrowse.c commands/rbrowse.c
    commands/cmd-rbrowse.h commands/rbrowse.h
    commands/cmd-redo.c commands/redo.c
    commands/cmd-redo.h commands/redo.h
    commands/cmd-register-archive.c commands/register-archive.c
    commands/cmd-register-archive.h commands/register-archive.h
    commands/cmd-remove-log-version.c commands/remove-log-version.c
    commands/cmd-remove-log-version.h commands/remove-log-version.h
    commands/cmd-replay.c commands/replay.c
    commands/cmd-replay.h commands/replay.h
    commands/cmd-revisions.c commands/revisions.c
    commands/cmd-revisions.h commands/revisions.h
    commands/cmd-rm.c commands/rm.c
    commands/cmd-rm.h commands/rm.h
    commands/cmd-set-tree-version.c commands/set-tree-version.c
    commands/cmd-set-tree-version.h commands/set-tree-version.h
    commands/cmd-show-changeset.c commands/show-changeset.c
    commands/cmd-show-changeset.h commands/show-changeset.h
    commands/cmd-star-merge.c commands/star-merge.c
    commands/cmd-star-merge.h commands/star-merge.h
    commands/cmd-switch.c commands/switch.c
    commands/cmd-switch.h commands/switch.h
    commands/cmd-sync-tree.c commands/sync-tree.c
    commands/cmd-sync-tree.h commands/sync-tree.h
    commands/cmd-tree-root.c commands/tree-root.c
    commands/cmd-tree-root.h commands/tree-root.h
    commands/cmd-tree-version.c commands/tree-version.c
    commands/cmd-tree-version.h commands/tree-version.h
    commands/cmd-uncacherev.c commands/uncacherev.c
    commands/cmd-uncacherev.h commands/uncacherev.h
    commands/cmd-undo.c commands/undo.c
    commands/cmd-undo.h commands/undo.h
    commands/cmd-update.c commands/update.c
    commands/cmd-update.h commands/update.h
    commands/cmd-valid-package-name.c commands/valid-package-name.c
    commands/cmd-valid-package-name.h commands/valid-package-name.h
    commands/cmd-versions.c commands/versions.c
    commands/cmd-versions.h commands/versions.h
    commands/cmd-whereis-archive.c commands/whereis-archive.c
    commands/cmd-whereis-archive.h commands/whereis-archive.h
    commands/lint.c commands/status.c
    commands/lint.h commands/status.h
Modified-files: baz/baz.c commands/abrowse.c
    commands/abrowse.h commands/add-id.c commands/add-id.h
    commands/add-log-version.c commands/add-log-version.h
    commands/add-pristine.c commands/add-pristine.h
    commands/ancestry-graph.c commands/ancestry-graph.h
    commands/ancestry.c commands/ancestry.h
    commands/apply-changeset.c commands/apply-changeset.h
    commands/apply-delta.c commands/apply-delta.h
    commands/archive-fixup.c commands/archive-fixup.h
    commands/archive-meta-info.c
    commands/archive-meta-info.h commands/archive-mirror.c
    commands/archive-mirror.h commands/archive-setup.c
    commands/archive-setup.h commands/archive-snapshot.c
    commands/archive-snapshot.h commands/archive-version.c
    commands/archive-version.h commands/archives.c
    commands/archives.h commands/branch.c commands/branch.h
    commands/branches.c commands/branches.h
    commands/build-config.c commands/build-config.h
    commands/cachedrevs.c commands/cachedrevs.h
    commands/cacherev.c commands/cacherev.h
    commands/cat-archive-log.c commands/cat-archive-log.h
    commands/cat-config.c commands/cat-config.h
    commands/cat-log.c commands/categories.c
    commands/categories.h commands/changelog.c
    commands/changeset.c commands/cmds.c commands/commit.c
    commands/default-id.c commands/delete-id.c
    commands/delta.c commands/diff.c commands/escape.c
    commands/file-diff.c commands/file-find.c
    commands/find-pristine.c commands/get-changeset.c
    commands/get.c commands/grab.c commands/help.c
    commands/id-tagging-defaults.c
    commands/id-tagging-method.c commands/id.c
    commands/import.c commands/init-tree.c
    commands/inventory.c commands/join-branch.c
    commands/library-add.c commands/library-archives.c
    commands/library-branches.c
    commands/library-categories.c commands/library-config.c
    commands/library-file.c commands/library-find.c
    commands/library-log.c commands/library-remove.c
    commands/library-revisions.c
    commands/library-versions.c commands/lock-pristine.c
    commands/lock-revision.c commands/log-for-merge.c
    commands/log-versions.c commands/logs.c
    commands/make-archive.c commands/make-branch.c
    commands/make-category.c commands/make-log.c
    commands/make-version.c commands/merges.c
    commands/missing.c commands/move-id.c commands/mv.c
    commands/my-default-archive.c commands/my-id.c
    commands/my-revision-library.c commands/new-merges.c
    commands/parse-package-name.c commands/pristines.c
    commands/rbrowse.c commands/redo.c
    commands/register-archive.c
    commands/remove-log-version.c commands/replay.c
    commands/revisions.c commands/rm.c
    commands/set-tree-version.c commands/show-changeset.c
    commands/star-merge.c commands/status.c
    commands/status.h commands/switch.c commands/sync-tree.c
    commands/tests/unit-cmd-diff.c commands/tree-root.c
    commands/tree-version.c commands/uncacherev.c
    commands/undo.c commands/update.c
    commands/valid-package-name.c commands/versions.c
    commands/whereis-archive.c libarch/apply-changeset.c
    libarch/build-revision.c libarch/changelogs.c
    libarch/changeset-report.c libarch/changeset-report.h
    libarch/configs.c libarch/merge-three-way.c
    libarch/merge-three-way.h libarch/pristines.c
    libarch/proj-tree-lint.c libarch/proj-tree-lint.h
    libarch/project-tree.c libarch/project-tree.h
    libarch/star-merge.c libarch/tag.c tests/Makefile.in
    tests/test-star-merge.sh tests/test-switch.sh
    tests/test-tag.sh
New-patches: jblack@gnuarch.org--2004/baz--problems--1.1--base-0
    jblack@gnuarch.org--2004/baz--problems--1.1--patch-1
    jblack@gnuarch.org--2004/baz--problems--1.1--patch-2
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4488--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4488--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-25
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-26
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-27
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-28
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-29
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-30
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-31
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-32
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-33
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-34
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-35
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-36
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-37
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-38
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-39
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-40
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-41
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-42
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-43
    robert.collins@canonical.com--general/bazaar--merge--1.1--base-0
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-1
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-2
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-3
    thelove@canonical.com/bazaar--devo--1.1--patch-34
    thelove@canonical.com/bazaar--devo--1.1--patch-35
    thelove@canonical.com/bazaar--devo--1.1--patch-36
    thelove@canonical.com/bazaar--devo--1.1--patch-37
    thelove@canonical.com/bazaar--devo--1.1--patch-38
    thelove@canonical.com/bazaar--devo--1.1--patch-39
    thelove@canonical.com/bazaar--devo--1.1--patch-40
    thelove@canonical.com/bazaar--devo--1.1--patch-41
    thelove@canonical.com/bazaar--devo--1.1--patch-42
    thelove@canonical.com/bazaar--devo--1.1--patch-43
    thelove@canonical.com/bazaar--devo--1.1--patch-44
    thelove@canonical.com/bazaar--devo--1.1--patch-45
    thelove@canonical.com/bazaar--devo--1.1--patch-46
    thelove@canonical.com/bazaar--devo--1.1--patch-47
    thelove@canonical.com/bazaar--devo--1.1--patch-48
    thelove@canonical.com/bazaar--devo--1.1--patch-49
Summary: sync with thelove.
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--problems--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-30

 * jblack@gnuarch.org--2004/baz--problems--1.1--patch-1
   First working stab at problems command

 * jblack@gnuarch.org--2004/baz--problems--1.1--patch-2
   For some silly reason my boss decided to work on the same code he assigned me to work on

 * rob.weir@canonical.com--2004-public/baz--bug4488--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-33

 * rob.weir@canonical.com--2004-public/baz--bug4488--0--patch-1
   Add note about importing.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-25
   fix up gcc errors on amd64

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-26
   fix libneon includes in cmd-register-archive.c (should be system includes not local)

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-27
   merge from thelove@canonical.com/baz--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-28
   clean up merge 3 way temp dir after use

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-29
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-30
   rename all cmd-* files to *, reducing path info duplication

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-31
   add deprecated lint command

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-32
   deprecated commands must fail on exit

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-33
   make changes actually do a changeset again, but not pretty yet

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-34
   make baz changes pretty

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-35
   replace diff --nodiffs with diff --summary. Bug #4293

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-36
   correct accidental creation of {arch} directories on branching

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-37
   make --three-way the default for star merge, and fix thus uncovered bugs.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-38
   check for old reject file path too

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-39
   changes->status, and lint output after diffs

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-40
   implement status --lint

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-41
   teach help to only show aliases upon request

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-42
   make star-merge -t a deprecated error-on-use option

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-43
   merge conflict detection fix from robert.collins@canonical.com--general/bazaar--merge--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--base-0
   tag of robert.collins@canonical.com--general/bazaar--devel--1.1--patch-41

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-1
   test three-way does not conflict on repeated hunks

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-2
   trivial test for merge3 merging of hunks

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-3
   fix up star-merge three way conflict detection

 * thelove@canonical.com/bazaar--devo--1.1--patch-34
   fix up gcc errors on amd64

 * thelove@canonical.com/bazaar--devo--1.1--patch-35
   clean up merge 3 way temp dir after use

 * thelove@canonical.com/bazaar--devo--1.1--patch-36
   clean up merge 3 way temp dir after use

 * thelove@canonical.com/bazaar--devo--1.1--patch-37
   baz now has conflict tracking (of a sort)

 * thelove@canonical.com/bazaar--devo--1.1--patch-38
   rename all cmd-* files to *, reducing path info duplication

 * thelove@canonical.com/bazaar--devo--1.1--patch-39
   reimplement a changes command for local tree changes, replacing the temporary problems command bug #4293

 * thelove@canonical.com/bazaar--devo--1.1--patch-40
   replace diff --nodiffs with diff --summary. Bug #4293

 * thelove@canonical.com/bazaar--devo--1.1--patch-41
   correct accidental creation of {arch} directories on branching

 * thelove@canonical.com/bazaar--devo--1.1--patch-42
   make --three-way the default for star merge, and fix thus uncovered bugs.

 * thelove@canonical.com/bazaar--devo--1.1--patch-43
   check for old reject file path too

 * thelove@canonical.com/bazaar--devo--1.1--patch-44
   changes->status, and lint output after diffs

 * thelove@canonical.com/bazaar--devo--1.1--patch-45
   implement status --lint

 * thelove@canonical.com/bazaar--devo--1.1--patch-46
   teach help to only show aliases upon request

 * thelove@canonical.com/bazaar--devo--1.1--patch-47
   make star-merge -t a deprecated error-on-use option

 * thelove@canonical.com/bazaar--devo--1.1--patch-48
   merge conflict detection fix from robert.collins@canonical.com--general/bazaar--merge--1.1

 * thelove@canonical.com/bazaar--devo--1.1--patch-49
   Fix #4488.

